Day 3 - Code Version 4

Cleanup, Split function list