Formatting and cleaned up a method related to onRemove
Merge pull request #149 from branflake2267/brandon_fixes

Formatting and cleaned up a method related to onRemove