Made some helper methods static