Fixed code outfit. More compact and efficient.