Removed unused imports
Made use of already defined constants
Made use of already defined constants
Removed modification of name as it is already done in lazy dataset