project cleanup

*refactoring required for future development