added commenting and shortened method names