Acceptance changes

changed constants to private
removed unnecessary method
removed redundant null initialization