Core pr 5

Code style fixes.