Style / code cleanup
Style / code cleanup