Cleaned up annotations, and fixed serialVersionUID