cleaned up some inconsistencies
cleaned up allocation