Some more refactoring
Comments + code cleanup