Update year and clean up comments