Clean up code some with some static imports