Clean up code base, futher development