[Code Cleanup]