Clean up code from lint checks