Code tidy
Cleaned up site and closed #39