Formatting. Code OCD :smile:
Add some user interaction to the client