Updated instructions and code cleanup