Cleanup / consistent code formatting