Better code formatting