Improve assignment 04