Changed attribute setting in 'initialize' methods to use @ rather than magic method.