Refactor Code

Make minor syntax updates.