Removed nano.save file
Styling and refactoring
Fixed merge conflicts