Fixing long lines and some indenting