Cleaning code, adding px and indexing tags correctly