start of cleanup and changing to match code standards part 1.