refactoring and style changes
Pushing to Development
Fixing Forge