added contributors, code cleanup