Clean up.. Also keep format inline with Deviant..