removed stubs
fixed formatting errors