Organise method a little better