use 2 space indents
extracted functions to several files