clean up empty spaces, double check master updated