Source style clean up