Added code formatting suggestions by @embray