reformatted, removed not used code