Minor cleanup for consistency and added comments..