Clean up Capsule.java