Clean up various helper methods