[Code Cleanup]
1.1.7