cleaned up things
Merge pull request #1 from gabs1234/cleanup

cleaned up things