Nitpicking / code cleanup