Update #309 - Remove duplicate class that was added by mistake
Update #309 - Clean up code a little more