Cleaning up.

taking care of some colons and functions