Cleaned up template

Now features JavaDoc comments!