Added better names for variables