Properly formatting the code too my liking