Cleaned up the source