Worked through files and improved syntax

[ticket: X]