Little improvements under the hood
