Cleanup and added comments to new methods.