Make code cleaner