Improve look of code