Cleaned up JavaDoc