Long overdue whitespace and line break fixes
Bumped to v1.11