Minor aesthetics changes