Cleaning pass - removed old commented code and collision now uses appropriate boolean