Re-format & Re-structure code.