Remove old initalizing code
Fix indents