Cleaned up JavaDoc's