Code cleanup. Final commit