Fix not working, and refactor

:(
Line is too long. [81/80]