Refactor rake tasks
Use thin everywhere