Cleanup and improving nose plugin