Second commit

clean code