nothing fncy, just code cleanup