Cleanup
Fixed minor bug