Minor fixes

Clean up code & files