Code rework
Property needs to be static
Some code cleanup
Code cleanup