Made the interface prettier

also made the code easier to read