Code cleaned up with Syntastic.