cleaned up and organized webapp