remove unnecessary forward declaration
indent fixes