Extract settings to a separate class
Whitespace and code style
Move a method with similar methods
Remove unused/non-working stuff