previous few commits code cleanup