Freshed up code formatting