Cleaning up the code some - removed shape collision from shape