started some clearn up work