Jamie H - Updated naming conventions. Refactored a bit.