Small formatting changes. Renamed several methods to comply with naming convention.