Realigned and reformatted code