File upload working. Tidy up