renamed several methods and fixed functions that were too wide