Change to buildfile.
some style changes
Comments and method annotations.