Cleanup

- Changed input and raw_input text
- More PEP 8 compliance