Some clean up

Removed the order