Enter codes tidy up