shortened too long lines and removed redundant brackets