clened up code a bit more