Code cleanup

1. Identation
2. 301 redirects