Cleaned up code & message
Added constancy. Nothing major