Fixed indentation and shortening long lines