Remove test code
Fix colleague styling