FAST MODE ENABLED
Code formatting
unit test cleanup