Changed way methods are called and added commenting per method