More appealing formatting and removed dead code.