Cleanup

Warnings bug me