Tidying up

- Tidy up code
- POST data now works