code cleanup
fixing merge conflicts