Code Clean up

That was pretty bad, this is slightly better