removed a lot of user boilerplate
cleaned up request handlers