Attempt at making the code style more consistent.