PEP8 applied and some methods implemented