Cleanup and some "cool" stuff