Logical rearrange of methods + line breaking + cleanup.