Rearranges things a bit. Removes a console statement.