Made some cleanup
Made some cleanup of files:)