Reworked some code