code cleanup & README update