Cleaning up a little

Tons of mess from trying to fix bounce issue getting cleaned up.