format, access modifiers and minor cleanup