fixing tiny stuff.. due to copy-past best-practice