Change method names, add commments

Change method names to be more meaningful and add in some missing
comments