reformatted code and added more annotation helpers plus updated service classes to work automagically with annotations