JavaDoc updated
annotations clean up
initial import