Minor Changes

-- minor aesthetic changes
-- organizing code