Improve code and look