Logic improved and spacing fixed

-- and
fixed      the s p a c i n g for rayu :D
--- Trincer