Organize methods

As discussed in IRC