cleanup/ code standards