Cleaned up the pint situation a bit; realized the empty methods were a mess