Clean up

Kitkat and clean up of file naming