Code clean up and changed the default port to 80