Code formatting, little improvements