cleanup a bunch of files

these changes were made after looking at landscape.io