Small code cleanup and name style fixes