Magic numbers -> constants

Weaken reference types (List->Collection)

Some other stuff