Code formatting, updated comments