refactored code to follow coding conventions, deleted unused files