WIP
Code style, cleanup