Added orders and was done cleanup of code