move references to core
fix code style

why don't we use auto-formatting for this if CS is THAT important?..