Better code styling