Implemented Doctrine Annotations // refactored some parts // cleanup