Just clean up the code

Just cleaning up the code a bit.

Still need to do separation between the server and the business logic.