Cleaned up files and made 'em tidy