Minor change and auto formating