reworked methods formatting