Adding option mode conversion.
Minor - cleaning white spaces.