Code reformat for easier use.