futher cleaning and un-re-factoring of uncessary bits