Cleanup: Fixed weird terminal behaviour