Cleaned up lint suggestions