Completed Nueroticz code refactoring and problem identification