Enhance terminal behaviour
Small cleanup