Improve code queality