code cleanup core standards (closer), fixes