Refactoring code, adding colors, etc.