Made code "cleaner"