cleaned up lint + formatting