Cleaned it up a bit

This is the latest edition from class