Clean up code
Fix guard clause bug