changes to ruby 1.9 style
finish layout