Made a couple of changes based on Ornicar's code review. Appreciated as always :D