small combing of code