Fixed bugs

Cleaner formatting