compile fixed and code cleanup