Move deface to a partial
Remove commented out code, clean up comments and style