little

changes to make the code more simple