code cleanup! mostly if spacing and comment cleanup