some nitpicking here and there