- Code cleanup and restructurization.