Refactored variables
Refactored mixin and function signatures
Refactored conditional blocks
Refactored return statements