Coding standard improvements. Moved option types to separate file.