Minor code optimizations and used colour shorthand