Found the rest of the code smells, just need to work on one of the features