Made code style consistent, began cleaning up