further improvement and cleaning up trash