Removed blank line, shortened line, removed duplicate code