Formatting, removed some comments