Style / code cleanup