little bit of code cleanup