second commit

made it more "standard"