cleaned up POD, method names