Made some simple changes
to make the code easyer to work
with later on.