Clean up and curse warnings. Offensive content in this commit :P