Rewrote some code to be more reusable
Silly parenthesis