Formatting and removed check if variable is already defined