Fixed collision and cleaned up a little