Cleaned up code to pass `lint` build step