2014-06-24 | some cleanups and adjustments