Feature/cleaning up code