renamed files in accordance with convention, formatting improvements, made return type of range an int