Dev

fixed formal issues and included changes for code quality requests