added @return annotations, fixed @param annotations, removed unusued imports