Removing the file extension and legacy version, also bug fix
Formatting, I think, old changes