Properly fix spacing?