Extract `if` / `else` clause to a private method
Extract more methods
Fixed un-needed `private`
Extract even more methods