Refactor - Fixed syntax issues