refactoring + standardization of syntax