Issue #425 fixed long lines and indentation