Merge branch 'feature/Code_Cleanup_and_Optimization' into develop, closed #7