Added tags. File cleanup.