Cleaning && miscellaneous adjustements