Make code a bit cleaner