Cleanup Code

- Clean up code
- fixed lostpassword URL