fixed suggestions by @jezdez