made some code nicer