Consistent: Code Cleanup