Minor code improvements..