Cleanup/formatting - moving things to separate files