Fix task requests with ORM / clean some code / fix checkstyle