Remove all unused code. Add indenting and etc