Made requested code style tweaks