removed unnecessary use of holders; cleanup, whitespace, formatting