Reworking the method layout