The code is less messy now