Cleaned up JavaDoc a little