Cleaned up

This better work....