Core: General cleanup - cosmetic

Signed-off-by: bootz <bootz@projectskyfire.org>