removed unnecessary order() methods, updated comments and did cleanup