[fix] [cleanup] fixes while testing and code cleanup