Revert some unnesassary comments and line splitting