Cleaned AnnotationConsumer.java and Evaluation.java