only need fwd declaration of classes
style & other updates