linting fixes for less than 90 chars
fix remaining linting errors
remove braces