remove needless lines and change to more readable resource order. Should not change functionality.