Cleaned up a few things - commented out method arguments that is unused