Removed unnecessary verification.
Maybe fixed missing end error.