renamed files in accordance with convention, formatting improvements, ma...

...de return type of range an int