Contructor refact
Cleanup, refact. Fix small errors.