removed some redundancy. Formatting.