Fix not working, and refactor

:(
Extra empty line detected at body end.