Tidied make tasks