Get rid of system commands to get & set properties
Formated source code