Improve code quality & structure