Add whitespace
Move initialization to one function