Simplifying methods and adding comments as well