Separate by articles
Clean up formatting
Logical rearrange of methods + line breaking + cleanup.