Added formatting (Thanks Hunice ;-)
Before base / screen / print refactor
base / screen / print refactor: done