Some cleanup of access modifiers and commenting