Cleaned up/commented Engine objects