Refined most methods and added missing commenting