Fix whitespace and adjust styles