Code cleanup. Final version before submission