Begin of code cleanup and bug hunt