Improve & clean code