Second commit - fixed and cleaned