Remove redundant self references
Clean up Rakefile
Use single quotes when there is no interpolation
Remove whitespace