Improve

Code inspection performed