Cleanup. Fix #3