abstracted declaration classes working, removed large block comments from files