These changes close the lintian warning C0411.
Add some spaces, remove lines,... now format is better (lintian).
This eases testing of option values inside the code. This instance is implemented as the read-only copy of the obtained 'options' object, so callers won't be able to modify its contents. Signed-off-by: Eygene Ryabinkin <rea@codelabs.ru>
