Continue to normalize code + improvements