ticket #5

clean code