Cleaned up formatting and added is_callable