Made the code proper tidy.