Clean up
Fixed possible errors