some minor CS and code tweaks