further cleanup & reformatting
update once again