Just tidy up the code a bit

Just tidy up the code a bit