/Code cleanup