Better comments and let the JVM handle the servial version id