Started clean up while reading the code