core: Indentation and readability changes

Signed-off-by: Robin Hallabro <robin.hallabro@sveabyran.se>