Linting, removing unncessary error handling...