Feature/code clean up