PEP8 and add tag support