WIP: Pretty code up